Tweak some more formats to use our common gbfile api.

diff --git a/coastexp.c b/coastexp.c
index 3af5b093d2a64cfd76b77a3014d806372e6fab83..8da17a061530613fe4693624ec1cdb0613f5e6df 100755 (executable)
--- a/coastexp.c
+++ b/coastexp.c
@@ -29,8 +29,7 @@
 
 #include "uuid.h"
 
-static FILE *fd;
-static FILE *ofd;
+static gbfile *fd, *ofd;
 
 #define MYNAME "coastexp"
 #define MY_CBUF 4096
@@ -312,7 +311,7 @@ ce_cdata(void *dta, const XML_Char *xml_s, int len)
 void
 ce_rd_init(const char *fname)
 {
-       fd = xfopen(fname, "r", MYNAME);
+       fd = gbfopen(fname, "r", MYNAME);
        QUEUE_INIT(&ce_route_head);
        QUEUE_INIT(&ce_mark_head);
 
@@ -335,8 +334,8 @@ ce_read(void)
        int len;
        char buf[MY_CBUF];
 
-       while ((len = fread(buf, 1, sizeof(buf), fd))) {
-               if (!XML_Parse(psr, buf, len, feof(fd))) {
+       while ((len = gbfread(buf, 1, sizeof(buf), fd))) {
+               if (!XML_Parse(psr, buf, len, gbfeof(fd))) {
                        fatal(MYNAME ":Parse error at %d: %s\n",
                                (int) XML_GetCurrentLineNumber(psr),
                                XML_ErrorString(XML_GetErrorCode(psr)));
@@ -478,7 +477,7 @@ ce_rd_deinit(void)
                ce_free_mark(mark);
        }
 
-       fclose(fd);
+       gbfclose(fd);
        xfree(element);
        xfree(cdatastr);
 }
@@ -494,13 +493,13 @@ ce_wr_init(const char *fname)
        uuid_buffer = xcalloc(MY_UBUF,1);
        xml_buffer = xcalloc(MY_XBUF, 1);
 
-       ofd = xfopen(fname, "w", MYNAME);
+       ofd = gbfopen(fname, "w", MYNAME);
 }
 
 void
 ce_wr_deinit(void)
 {
-       fclose(ofd);
+       gbfclose(ofd);
 
        // Free the buffers used for writing
        xfree(time_buffer);
@@ -559,7 +558,7 @@ ce_route_disp(const waypoint *waypointp)
        currentMark->id = id;
        currentMark->wp = (waypoint *) waypointp;
        ENQUEUE_TAIL(&ce_mark_head, &currentMark->Q);
-       fprintf(ofd, "\t\t\t%s\n", id); // CE's departure from XML standard!
+       gbfprintf(ofd, "\t\t\t%s\n", id); // CE's departure from XML standard!
 }
 
 /* Generate route trailer XML */

diff --git a/garmin_fs.c b/garmin_fs.c
index b22621ea3151820f21d1266fe42a7b21a94c395a..47afd54c8ddfb1ff47e7b755b54ed8b9efefbef2 100644 (file)
--- a/garmin_fs.c
+++ b/garmin_fs.c
@@ -96,7 +96,7 @@ void garmin_fs_copy(garmin_fs_t **dest, garmin_fs_t *src)
 /* GPX - out */
 
 void 
-garmin_fs_xml_fprint(FILE *ofd, const waypoint *waypt)
+garmin_fs_xml_fprint(gbfile *ofd, const waypoint *waypt)
 {
        garmin_fs_t *gmsd = GMSD_FIND(waypt);
        if (gmsd == NULL) return;
@@ -109,18 +109,18 @@ garmin_fs_xml_fprint(FILE *ofd, const waypoint *waypt)
        {
                int space = 1;
                
-               fprintf(ofd, "%*s<extensions>\n", space++ * 2, "");
-               fprintf(ofd, "%*s<gpxx:WaypointExtension xmlns:gpxx=\"" \
+               gbfprintf(ofd, "%*s<extensions>\n", space++ * 2, "");
+               gbfprintf(ofd, "%*s<gpxx:WaypointExtension xmlns:gpxx=\"" \
                        "http://www.garmin.com/xmlschemas/GpxExtensions/v2\" " \
                        "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" " \
                        "xsi:schemaLocation=\"http://www.garmin.com/xmlschemas/GpxExtensions/v2 " \
                        "http://www.garmin.com/xmlschemas/GpxExtensions/v2/GpxExtensionsv2.xsd\">\n", space++ * 2, "");
                if (gmsd->flags.proximity)
-                       fprintf(ofd, "%*s<gpxx:Proximity>%.6f</gpxx:Proximity>\n", space * 2, "", gmsd->proximity);
+                       gbfprintf(ofd, "%*s<gpxx:Proximity>%.6f</gpxx:Proximity>\n", space * 2, "", gmsd->proximity);
                if (gmsd->flags.temperature)
-                       fprintf(ofd, "%*s<gpxx:Temperature>%.6f</gpxx:Temperature>\n", space * 2, "", gmsd->temperature);
+                       gbfprintf(ofd, "%*s<gpxx:Temperature>%.6f</gpxx:Temperature>\n", space * 2, "", gmsd->temperature);
                if (gmsd->flags.depth)
-                       fprintf(ofd, "%*s<gpxx:Depth>%.6f</gpxx:Depth>\n", space * 2, "", gmsd->depth);
+                       gbfprintf(ofd, "%*s<gpxx:Depth>%.6f</gpxx:Depth>\n", space * 2, "", gmsd->depth);
                if (gmsd->flags.display)
                {
                        char *cx;
@@ -136,23 +136,23 @@ garmin_fs_xml_fprint(FILE *ofd, const waypoint *waypt)
                                        cx = "SymbolAndName"; 
                                        break;
                        }
-                       fprintf(ofd, "%*s<gpxx:DisplayMode>%s</gpxx:DisplayMode>\n", space * 2, "", cx);
+                       gbfprintf(ofd, "%*s<gpxx:DisplayMode>%s</gpxx:DisplayMode>\n", space * 2, "", cx);
                }
                if (gmsd->flags.category && gmsd->category)
                {
                        int i;
                        gbuint16 cx = gmsd->category;
-                       fprintf(ofd, "%*s<gpxx:Categories>\n", space++ * 2, "");
+                       gbfprintf(ofd, "%*s<gpxx:Categories>\n", space++ * 2, "");
                        for (i = 0; i < 16; i++) 
                        {
                                if (cx & 1)
-                                       fprintf(ofd, "%*s<gpxx:Category>Category %d</gpxx:Category>\n", space*2, "", i+1);
+                                       gbfprintf(ofd, "%*s<gpxx:Category>Category %d</gpxx:Category>\n", space*2, "", i+1);
                                cx = cx >> 1;
                        }
-                       fprintf(ofd, "%*s</gpxx:Categories>\n", --space * 2, "");
+                       gbfprintf(ofd, "%*s</gpxx:Categories>\n", --space * 2, "");
                }
-               fprintf(ofd, "%*s</gpxx:WaypointExtension>\n", --space * 2, "");
-               fprintf(ofd, "%*s</extensions>\n", --space * 2, "");
+               gbfprintf(ofd, "%*s</gpxx:WaypointExtension>\n", --space * 2, "");
+               gbfprintf(ofd, "%*s</extensions>\n", --space * 2, "");
        }
        
 }

diff --git a/garmin_fs.h b/garmin_fs.h
index 1235251233d3db0250b39c80632c31137ac3b34c..f12a11a8ec5d71c4ea7aee244ee343ac03f0d823 100644 (file)
--- a/garmin_fs.h
+++ b/garmin_fs.h
@@ -106,7 +106,7 @@ char *garmin_fs_xstrdup(const char *src, size_t size);
 
 /* for GPX */
 void garmin_fs_xml_convert(const int base_tag, int tag, const char *cdatastr, waypoint *waypt);
-void garmin_fs_xml_fprint(FILE *ofd, const waypoint *waypt);
+void garmin_fs_xml_fprint(gbfile *ofd, const waypoint *waypt);
 
 /* common garmin_fs utilities */
 

diff --git a/glogbook.c b/glogbook.c
index 711d1225b4692b23df983938842844aaa1e9ff10..0c8bcae3eb4477e2b379e061c37345308a0da314 100644 (file)
--- a/glogbook.c
+++ b/glogbook.c
@@ -22,7 +22,7 @@
 #include "defs.h"
 #include "xmlgeneric.h"
 
-static FILE *ofd;
+static gbfile *ofd;
 static waypoint *wpt_tmp;
 static route_head *trk_head;
 
@@ -75,52 +75,52 @@ glogbook_rd_deinit(void)
 static void
 glogbook_wr_init(const char *fname)
 {
-        ofd = xfopen(fname, "w", MYNAME);
+        ofd = gbfopen(fname, "w", MYNAME);
 }
 
 static void
 glogbook_wr_deinit(void)
 {
-        fclose(ofd);
+        gbfclose(ofd);
 }
 
 static void
 glogbook_waypt_pr(const waypoint *wpt)
 {      
-       fprintf(ofd, "            <Trackpoint>\n");
-       fprintf(ofd, "                <Position>\n");
-       fprintf(ofd, "                    <Latitude>%.5f</Latitude>\n", wpt->latitude);
-       fprintf(ofd, "                    <Longitude>%.5f</Longitude>\n", wpt->longitude);
+       gbfprintf(ofd, "            <Trackpoint>\n");
+       gbfprintf(ofd, "                <Position>\n");
+       gbfprintf(ofd, "                    <Latitude>%.5f</Latitude>\n", wpt->latitude);
+       gbfprintf(ofd, "                    <Longitude>%.5f</Longitude>\n", wpt->longitude);
        if (wpt->altitude != unknown_alt) {
-               fprintf(ofd, "                    <Altitude>%.3f</Altitude>\n", wpt->altitude);
+               gbfprintf(ofd, "                    <Altitude>%.3f</Altitude>\n", wpt->altitude);
        }
-       fprintf(ofd, "                </Position>\n");
-       fprintf(ofd, "                ");
+       gbfprintf(ofd, "                </Position>\n");
+       gbfprintf(ofd, "                ");
        xml_write_time(ofd, wpt->creation_time, "Time");
-       fprintf(ofd, "            </Trackpoint>\n");
+       gbfprintf(ofd, "            </Trackpoint>\n");
 }
 
 static void
 glogbook_hdr( const route_head *rte)
 {
-       fprintf(ofd, "        <Track>\n");
+       gbfprintf(ofd, "        <Track>\n");
 }
 
 static void
 glogbook_ftr(const route_head *rte)
 {
-       fprintf(ofd, "        </Track>\n");
+       gbfprintf(ofd, "        </Track>\n");
 }
 
 static void
 glogbook_write(void)
 {
-       fprintf(ofd, "<?xml version=\"1.0\" ?>\n");
-       fprintf(ofd, "<History xmlns=\"http://www.garmin.com/xmlschemas/ForerunnerLogbook\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://www.garmin.com/xmlschemas/ForerunnerLogbook http://www.garmin.com/xmlschemas/ForerunnerLogbookv1.xsd\" version=\"1\">\n");
-       fprintf(ofd, "    <Run>\n");
+       gbfprintf(ofd, "<?xml version=\"1.0\" ?>\n");
+       gbfprintf(ofd, "<History xmlns=\"http://www.garmin.com/xmlschemas/ForerunnerLogbook\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://www.garmin.com/xmlschemas/ForerunnerLogbook http://www.garmin.com/xmlschemas/ForerunnerLogbookv1.xsd\" version=\"1\">\n");
+       gbfprintf(ofd, "    <Run>\n");
        track_disp_all(glogbook_hdr, glogbook_ftr, glogbook_waypt_pr);
-       fprintf(ofd, "    </Run>\n");
-       fprintf(ofd, "</History>\n");
+       gbfprintf(ofd, "    </Run>\n");
+       gbfprintf(ofd, "</History>\n");
 }
 
 void   gl_trk_s(const char *args, const char **unused)

diff --git a/gpx.c b/gpx.c
index 872daef9ff8eb4ddb6340d32645c2ddd44990b43..6551d01dfee85bb591daacbafa9eb8a5ec1768d1 100644 (file)
--- a/gpx.c
+++ b/gpx.c
@@ -45,8 +45,8 @@ static vmem_t current_tag;
 
 static waypoint *wpt_tmp;
 static int cache_descr_is_html;
-static FILE *fd;
-static FILE *ofd;
+static gbfile *fd;
+static gbfile *ofd;
 static short_handle mkshort_handle;
 
 static const char *input_string = NULL;
@@ -227,18 +227,18 @@ gpx_write_gdata(gpx_global_entry *ge, char *tag)
                return;
        }
 
-       fprintf(ofd, "<%s>", tag);
+       gbfprintf(ofd, "<%s>", tag);
        QUEUE_FOR_EACH(&ge->queue, elem, tmp) {
                gep = BASE_STRUCT(elem, gpx_global_entry, queue);
-               fprintf(ofd, "%s", gep->tagdata);
+               gbfprintf(ofd, "%s", gep->tagdata);
                /* Some tags we just output once. */
                if ((0 == strcmp(tag, "url")) ||
                        (0 == strcmp(tag, "email"))) {
                        break;
                }
-               fprintf(ofd, " ");
+               gbfprintf(ofd, " ");
        }
-       fprintf(ofd, "</%s>\n", tag);
+       gbfprintf(ofd, "</%s>\n", tag);
 }
 
 
@@ -1097,7 +1097,7 @@ static void
 gpx_rd_init(const char *fname)
 {
        if ( fname[0] ) {
-               fd = xfopen(fname, "r", MYNAME);
+               fd = gbfopen(fname, "r", MYNAME);
        }
        else {
                fd = NULL;
@@ -1173,7 +1173,7 @@ gpx_rd_deinit(void)
                gpx_author = NULL;
        }
        if (fd) {
-               fclose(fd);
+               gbfclose(fd);
        }
        XML_ParserFree(psr);
        psr = NULL;
@@ -1187,13 +1187,13 @@ gpx_wr_init(const char *fname)
 {
        mkshort_handle = mkshort_new_handle();
 
-       ofd = xfopen(fname, "w", MYNAME);
+       ofd = gbfopen(fname, "w", MYNAME);
 }
 
 static void
 gpx_wr_deinit(void)
 {
-       fclose(ofd);
+       gbfclose(ofd);
        mkshort_del_handle(&mkshort_handle);
 }
 
@@ -1225,8 +1225,8 @@ gpx_read(void)
                        char *badchar;
                        char *semi;
                        int maxentlength = 8;
-                       len = fread(buf, 1, MY_CBUF_SZ - maxentlength, fd);
-                       done = feof(fd) || !len;
+                       len = gbfread(buf, 1, MY_CBUF_SZ - maxentlength, fd);
+                       done = gbfeof(fd) || !len;
                        buf[len] = '\0';
                        badchar = buf+len-maxentlength;
                        badchar = strchr( badchar, '&' );
@@ -1234,7 +1234,7 @@ gpx_read(void)
                        while ( badchar && len < MY_CBUF_SZ-1) {
                                semi = strchr( badchar, ';');
                                while ( extra && !semi ) {
-                                       len += fread( buf+len, 1, 1, fd);
+                                       len += gbfread( buf+len, 1, 1, fd);
                                        buf[len]='\0';
                                        extra--;
                                        if ( buf[len-1] == ';') 
@@ -1292,15 +1292,15 @@ static void
 fprint_tag_and_attrs( char *prefix, char *suffix, xml_tag *tag )
 {
        char **pa;
-       fprintf( ofd, "%s%s", prefix, tag->tagname );
+       gbfprintf( ofd, "%s%s", prefix, tag->tagname );
        pa = tag->attributes;
        if ( pa ) {
                while ( *pa ) {
-                       fprintf( ofd, " %s=\"%s\"", pa[0], pa[1] );
+                       gbfprintf( ofd, " %s=\"%s\"", pa[0], pa[1] );
                        pa += 2;
                }
        }
-       fprintf( ofd, "%s", suffix );
+       gbfprintf( ofd, "%s", suffix );
 }
 
 static void
@@ -1316,7 +1316,7 @@ fprint_xml_chain( xml_tag *tag, const waypoint *wpt )
                
                        if ( tag->cdata ) {
                                tmp_ent = xml_entitize( tag->cdata );
-                               fprintf( ofd, "%s", tmp_ent );
+                               gbfprintf( ofd, "%s", tmp_ent );
                                xfree(tmp_ent);
                        }
                        if ( tag->child ) {
@@ -1327,11 +1327,11 @@ fprint_xml_chain( xml_tag *tag, const waypoint *wpt )
                                xml_write_time( ofd, wpt->gc_data.exported, 
                                                "groundspeak:exported" );
                        }
-                       fprintf( ofd, "</%s>\n", tag->tagname);
+                       gbfprintf( ofd, "</%s>\n", tag->tagname);
                }
                if ( tag->parentcdata ) {
                        tmp_ent = xml_entitize(tag->parentcdata);
-                       fprintf(ofd, "%s", tmp_ent );
+                       gbfprintf(ofd, "%s", tmp_ent );
                        xfree(tmp_ent);
                }
                tag = tag->sibling;     
@@ -1383,13 +1383,13 @@ write_gpx_url(const waypoint *waypointp)
                tmp_ent = xml_entitize(waypointp->url);
                if (gpx_wversion_num > 10) {
                        
-                       fprintf(ofd, "  <link href=\"%s%s\">\n", 
+                       gbfprintf(ofd, "  <link href=\"%s%s\">\n", 
                                urlbase ? urlbase : "", tmp_ent);
                        write_optional_xml_entity(ofd, "  ", "text", 
                                waypointp->url_link_text);
-                       fprintf(ofd, "  </link>\n");
+                       gbfprintf(ofd, "  </link>\n");
                } else {
-                       fprintf(ofd, "  <url>%s%s</url>\n", 
+                       gbfprintf(ofd, "  <url>%s%s</url>\n", 
                                urlbase ? urlbase : "", tmp_ent);
                        write_optional_xml_entity(ofd, "  ", "urlname", 
                                waypointp->url_link_text);
@@ -1430,19 +1430,19 @@ gpx_write_common_acc(const waypoint *waypointp, const char *indent)
                        break;
        }
        if (fix) {
-               fprintf(ofd, "%s<fix>%s</fix>\n", indent, fix);
+               gbfprintf(ofd, "%s<fix>%s</fix>\n", indent, fix);
        }
        if (waypointp->sat > 0) {
-               fprintf(ofd, "%s<sat>%d</sat>\n", indent, waypointp->sat);
+               gbfprintf(ofd, "%s<sat>%d</sat>\n", indent, waypointp->sat);
        }
        if (waypointp->hdop) {
-               fprintf(ofd, "%s<hdop>%f</hdop>\n", indent, waypointp->hdop);
+               gbfprintf(ofd, "%s<hdop>%f</hdop>\n", indent, waypointp->hdop);
        }
        if (waypointp->vdop) {
-               fprintf(ofd, "%s<vdop>%f</vdop>\n", indent, waypointp->vdop);
+               gbfprintf(ofd, "%s<vdop>%f</vdop>\n", indent, waypointp->vdop);
        }
        if (waypointp->pdop) {
-               fprintf(ofd, "%s<pdop>%f</pdop>\n", indent, waypointp->pdop);
+               gbfprintf(ofd, "%s<pdop>%f</pdop>\n", indent, waypointp->pdop);
        }
 }
 
@@ -1450,7 +1450,7 @@ static void
 gpx_write_common_position(const waypoint *waypointp, const char *indent)
 {
        if (waypointp->altitude != unknown_alt) {
-               fprintf(ofd, "%s<ele>%f</ele>\n",
+               gbfprintf(ofd, "%s<ele>%f</ele>\n",
                         indent, waypointp->altitude);
        }
        if (waypointp->creation_time) {
@@ -1494,7 +1494,7 @@ gpx_waypt_pr(const waypoint *waypointp)
                                  mkshort(mkshort_handle, odesc) : 
                                  waypointp->shortname;
 
-       fprintf(ofd, "<wpt lat=\"" FLT_FMT "\" lon=\"" FLT_FMT "\">\n",
+       gbfprintf(ofd, "<wpt lat=\"" FLT_FMT "\" lon=\"" FLT_FMT "\">\n",
                waypointp->latitude,
                waypointp->longitude);
 
@@ -1509,7 +1509,7 @@ gpx_waypt_pr(const waypoint *waypointp)
        if (gpx_wversion_num > 10) {
                garmin_fs_xml_fprint(ofd, waypointp);
        }
-       fprintf(ofd, "</wpt>\n");
+       gbfprintf(ofd, "</wpt>\n");
 }
 
 static void
@@ -1517,13 +1517,13 @@ gpx_track_hdr(const route_head *rte)
 {
        fs_xml *fs_gpx;
 
-       fprintf(ofd, "<trk>\n");
+       gbfprintf(ofd, "<trk>\n");
        write_optional_xml_entity(ofd, "  ", "name", rte->rte_name);
        write_optional_xml_entity(ofd, "  ", "desc", rte->rte_desc);
        if (rte->rte_num) {
-               fprintf(ofd, "<number>%d</number>\n", rte->rte_num);
+               gbfprintf(ofd, "<number>%d</number>\n", rte->rte_num);
        }
-       fprintf(ofd, "<trkseg>\n");
+       gbfprintf(ofd, "<trkseg>\n");
 
        fs_gpx = (fs_xml *)fs_chain_find( rte->fs, FS_GPX );
        if ( fs_gpx ) {
@@ -1536,7 +1536,7 @@ gpx_track_disp(const waypoint *waypointp)
 {
        fs_xml *fs_gpx;
 
-       fprintf(ofd, "<trkpt lat=\"" FLT_FMT_T "\" lon=\"" FLT_FMT_T "\">\n",
+       gbfprintf(ofd, "<trkpt lat=\"" FLT_FMT_T "\" lon=\"" FLT_FMT_T "\">\n",
                waypointp->latitude,
                waypointp->longitude);
 
@@ -1545,11 +1545,11 @@ gpx_track_disp(const waypoint *waypointp)
        /* These were accidentally removed from 1.1 */
        if (gpx_wversion_num == 10) {
                if (waypointp->course >= 0) {
-                       fprintf(ofd, "  <course>%f</course>\n", 
+                       gbfprintf(ofd, "  <course>%f</course>\n", 
                                waypointp->course);
                }
                if (waypointp->speed >= 0) {
-                       fprintf(ofd, "  <speed>%f</speed>\n", 
+                       gbfprintf(ofd, "  <speed>%f</speed>\n", 
                                waypointp->speed);
                }
        }
@@ -1567,14 +1567,14 @@ gpx_track_disp(const waypoint *waypointp)
                fprint_xml_chain( fs_gpx->tag, waypointp );
        }
 
-       fprintf(ofd, "</trkpt>\n");
+       gbfprintf(ofd, "</trkpt>\n");
 }
 
 static void
 gpx_track_tlr(const route_head *rte)
 {
-       fprintf(ofd, "</trkseg>\n");
-       fprintf(ofd, "</trk>\n");
+       gbfprintf(ofd, "</trkseg>\n");
+       gbfprintf(ofd, "</trk>\n");
 }
 
 static
@@ -1588,11 +1588,11 @@ gpx_route_hdr(const route_head *rte)
 {
        fs_xml *fs_gpx;
 
-       fprintf(ofd, "<rte>\n");
+       gbfprintf(ofd, "<rte>\n");
        write_optional_xml_entity(ofd, "  ", "name", rte->rte_name);
        write_optional_xml_entity(ofd, "  ", "desc", rte->rte_desc);
        if (rte->rte_num) {
-               fprintf(ofd, "  <number>%d</number>\n", rte->rte_num);
+               gbfprintf(ofd, "  <number>%d</number>\n", rte->rte_num);
        }
 
        fs_gpx = (fs_xml *)fs_chain_find( rte->fs, FS_GPX );
@@ -1606,7 +1606,7 @@ gpx_route_disp(const waypoint *waypointp)
 {
        fs_xml *fs_gpx;
 
-       fprintf(ofd, "  <rtept lat=\"" FLT_FMT_R "\" lon=\"" FLT_FMT_R "\">\n",
+       gbfprintf(ofd, "  <rtept lat=\"" FLT_FMT_R "\" lon=\"" FLT_FMT_R "\">\n",
                waypointp->latitude,
                waypointp->longitude);
 
@@ -1619,13 +1619,13 @@ gpx_route_disp(const waypoint *waypointp)
                fprint_xml_chain( fs_gpx->tag, waypointp );
        }
 
-       fprintf(ofd, "  </rtept>\n");
+       gbfprintf(ofd, "  </rtept>\n");
 }
 
 static void
 gpx_route_tlr(const route_head *rte)
 {
-       fprintf(ofd, "</rte>\n");
+       gbfprintf(ofd, "</rte>\n");
 }
 
 static
@@ -1651,7 +1651,7 @@ gpx_write_bounds(void)
        track_disp_all(NULL, NULL, gpx_waypt_bound_calc);
 
        if (waypt_bounds_valid(&all_bounds)) {
-               fprintf(ofd, "<bounds minlat=\"%0.9f\" minlon=\"%0.9f\" "
+               gbfprintf(ofd, "<bounds minlat=\"%0.9f\" minlon=\"%0.9f\" "
                               "maxlat=\"%0.9f\" maxlon=\"%0.9f\"/>\n",
                               all_bounds.min_lat, all_bounds.min_lon, 
                               all_bounds.max_lat, all_bounds.max_lon);
@@ -1680,22 +1680,22 @@ gpx_write(void)
 
        setshort_length(mkshort_handle, short_length);
 
-       fprintf(ofd, "<?xml version=\"1.0\" encoding=\"%s\"?>\n", global_opts.charset_name);
-       fprintf(ofd, "<gpx\n version=\"%s\"\n", gpx_wversion);
-       fprintf(ofd, "creator=\"" CREATOR_NAME_URL "\"\n");
-       fprintf(ofd, "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n");
-       fprintf(ofd, "xmlns=\"http://www.topografix.com/GPX/%c/%c\"\n", gpx_wversion[0], gpx_wversion[2]);
+       gbfprintf(ofd, "<?xml version=\"1.0\" encoding=\"%s\"?>\n", global_opts.charset_name);
+       gbfprintf(ofd, "<gpx\n version=\"%s\"\n", gpx_wversion);
+       gbfprintf(ofd, "creator=\"" CREATOR_NAME_URL "\"\n");
+       gbfprintf(ofd, "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n");
+       gbfprintf(ofd, "xmlns=\"http://www.topografix.com/GPX/%c/%c\"\n", gpx_wversion[0], gpx_wversion[2]);
        if (xsi_schema_loc) {
-               fprintf(ofd, "xsi:schemaLocation=\"%s\">\n", xsi_schema_loc);
+               gbfprintf(ofd, "xsi:schemaLocation=\"%s\">\n", xsi_schema_loc);
        } else {
-               fprintf(ofd,
+               gbfprintf(ofd,
                        "xsi:schemaLocation=" DEFAULT_XSI_SCHEMA_LOC_FMT">\n",
                        gpx_wversion[0], gpx_wversion[2],
                        gpx_wversion[0], gpx_wversion[2]);
        }
 
        if (gpx_wversion_num > 10) {    
-               fprintf(ofd, "<metadata>\n");
+               gbfprintf(ofd, "<metadata>\n");
        }
        gpx_write_gdata(&gpx_global->name, "name");
        gpx_write_gdata(&gpx_global->desc, "desc");
@@ -1714,14 +1714,14 @@ gpx_write(void)
        gpx_write_bounds();
 
        if (gpx_wversion_num > 10) {    
-               fprintf(ofd, "</metadata>\n");
+               gbfprintf(ofd, "</metadata>\n");
        }
 
        waypt_disp_all(gpx_waypt_pr);
        gpx_route_pr();
        gpx_track_pr();
 
-       fprintf(ofd, "</gpx>\n");
+       gbfprintf(ofd, "</gpx>\n");
 }
 
 

diff --git a/hiketech.c b/hiketech.c
index c8e0ccced46c62d25e4282060ff9d510b97a07f8..c5f35b08d448b265d748a4a1f03e3bbbb2b94e56 100644 (file)
--- a/hiketech.c
+++ b/hiketech.c
@@ -22,7 +22,7 @@
 #include "defs.h"
 #include "xmlgeneric.h"
 
-static FILE *ofd;
+static gbfile *ofd;
 static waypoint *wpt_tmp;
 static route_head *trk_head;
 
@@ -94,26 +94,26 @@ hiketech_rd_deinit(void)
 static void
 hiketech_wr_init(const char *fname)
 {
-        ofd = xfopen(fname, "w", MYNAME);
+        ofd = gbfopen(fname, "w", MYNAME);
 }
 
 static void
 hiketech_wr_deinit(void)
 {
-        fclose(ofd);
+        gbfclose(ofd);
 }
 
 static void
 hiketech_trk_hdr(const route_head *rte)
 {
-       fprintf(ofd, "<trk>\n");
+       gbfprintf(ofd, "<trk>\n");
        write_optional_xml_entity(ofd, " ", "ident", rte->rte_name);
 }
 
 static void
 hiketech_trk_tlr(const route_head *rte)
 {
-       fprintf(ofd, "</trk>\n");
+       gbfprintf(ofd, "</trk>\n");
 }
 
 static void
@@ -121,52 +121,52 @@ hiketech_print_utc(time_t tm, const char *indent, const char *tag)
 {
        char tbuf[80];
         strftime(tbuf, sizeof(tbuf), "%Y-%m-%d %I:%M:%S", gmtime(&tm));
-       fprintf(ofd, "%s<%s>%s</%s>\n",indent,tag,tbuf,tag);
+       gbfprintf(ofd, "%s<%s>%s</%s>\n",indent,tag,tbuf,tag);
 }
 
 static void
 hiketech_trkpt_pr(const waypoint *waypointp)
 {
-       fprintf(ofd, " <pnt>\n");
+       gbfprintf(ofd, " <pnt>\n");
        if (waypointp->creation_time) {
                hiketech_print_utc(waypointp->creation_time, "  ", "utc");
        }
-       fprintf(ofd, "  <lat>%f</lat>\n", waypointp->latitude);
-       fprintf(ofd, "  <long>%f</long>\n", waypointp->longitude);
+       gbfprintf(ofd, "  <lat>%f</lat>\n", waypointp->latitude);
+       gbfprintf(ofd, "  <long>%f</long>\n", waypointp->longitude);
        if (waypointp->altitude != unknown_alt) {
-               fprintf(ofd, "  <alt>%f</alt>\n",
+               gbfprintf(ofd, "  <alt>%f</alt>\n",
                         waypointp->altitude);
        }
-       fprintf(ofd, " </pnt>\n");
+       gbfprintf(ofd, " </pnt>\n");
 }
 
 static void
 hiketech_waypt_pr(const waypoint *wpt)
 {      
-       fprintf(ofd, "<wpt>\n");
+       gbfprintf(ofd, "<wpt>\n");
        write_xml_entity(ofd, "\t", "ident", wpt->shortname);
        write_optional_xml_entity(ofd, "\t", "sym", wpt->icon_descr);
-       fprintf(ofd, "\t<lat>%f</lat>\n", wpt->latitude);
-       fprintf(ofd, "\t<long>%f</long>\n", wpt->longitude);
+       gbfprintf(ofd, "\t<lat>%f</lat>\n", wpt->latitude);
+       gbfprintf(ofd, "\t<long>%f</long>\n", wpt->longitude);
 
        /* 
         * These probably aren't technicallyconstants, but it's all 
         * we can do for now. 
         */
-       fprintf(ofd, "\t<color>\n\t\t<lbl>FAFFB4</lbl>\n\t\t<obj>FF8000</obj>\n\t</color>\n");
-       fprintf(ofd, "</wpt>\n");
+       gbfprintf(ofd, "\t<color>\n\t\t<lbl>FAFFB4</lbl>\n\t\t<obj>FF8000</obj>\n\t</color>\n");
+       gbfprintf(ofd, "</wpt>\n");
 }
 
 static void
 hiketech_write(void)
 {
-       fprintf(ofd, "<hiketech version=\"1.2\" url=\"http://www.hiketech.com\">\n");
-       fprintf(ofd, "<gpsdata>\n");
+       gbfprintf(ofd, "<hiketech version=\"1.2\" url=\"http://www.hiketech.com\">\n");
+       gbfprintf(ofd, "<gpsdata>\n");
        track_disp_all(hiketech_trk_hdr, hiketech_trk_tlr, hiketech_trkpt_pr);
        track_disp_all(NULL, NULL, hiketech_trkpt_pr);
        waypt_disp_all(hiketech_waypt_pr);
-       fprintf(ofd, "</gpsdata>\n");
-       fprintf(ofd, "</hiketech>\n");
+       gbfprintf(ofd, "</gpsdata>\n");
+       gbfprintf(ofd, "</hiketech>\n");
 }
 
 static

diff --git a/hsa_ndv.c b/hsa_ndv.c
index fba334f0f5156fb541e78cd31abc346e3bf0e389..23bb305a2ee88cec4275fa025f04cfd6118046d6 100644 (file)
--- a/hsa_ndv.c
+++ b/hsa_ndv.c
@@ -40,7 +40,7 @@ static void readVersion4( FILE* pFile);
 static void getAttr(const char *data, const char *attr, char **val, char seperator);
 
 static FILE *fd;
-static FILE *ofd;
+static gbfile *ofd;
 
 static
 arglist_t hsa_ndv_args[] = {
@@ -295,13 +295,13 @@ hsa_ndv_rd_deinit(void)
 static void
 hsa_ndv_wr_init(const char *fname)
 {
-       ofd = xfopen(fname, "w", MYNAME);
+       ofd = gbfopen(fname, "w", MYNAME);
 }
 
 static void
 hsa_ndv_wr_deinit(void)
 {
-       fclose(ofd);
+       gbfclose(ofd);
 }
 
 static int legNum = 0;
@@ -310,20 +310,20 @@ static void
 hsa_ndv_waypt_pr(const waypoint *waypointp)
 {
 
-       fprintf(ofd, "\t\t<Object>\n");
+       gbfprintf(ofd, "\t\t<Object>\n");
 
-       fprintf(ofd, "\t\t\t<ClassName>waypnt</ClassName>\n");
+       gbfprintf(ofd, "\t\t\t<ClassName>waypnt</ClassName>\n");
 //ignore these for now, they are s57 specific
 //     fprintf(ofd, "\t\t\t<FeatureNameAgency>0</FeatureNameAgency>\n");
 //     fprintf(ofd, "\t\t\t<FeatureNameSubDiv>1</FeatureNameSubDiv>\n");
 //     fprintf(ofd, "\t\t\t<FeatureNameNumber>1089009023</FeatureNameNumber>\n");
-       fprintf(ofd, "\t\t\t<Attr><![CDATA[attr=grpnam%s\x1ftrnrad50\x1fOBJNAM%s\x1flegnum%i\x1fusrmrk%s\x1fselect2\1f]]></Attr>\n", routeName, waypointp->shortname, legNum, waypointp->description);
-       fprintf(ofd, "\t\t\t<LegAttr><![CDATA[attr=grpnam%s\x1f]]></LegAttr>\n", routeName);
-       fprintf(ofd, "\t\t\t<NumberOfVertexs>1</NumberOfVertexs>\n");
-       fprintf(ofd, "\t\t\t<Latitude>%lf</Latitude>\n", waypointp->latitude);
-       fprintf(ofd, "\t\t\t<Longitude>%lf</Longitude>\n", waypointp->longitude);
+       gbfprintf(ofd, "\t\t\t<Attr><![CDATA[attr=grpnam%s\x1ftrnrad50\x1fOBJNAM%s\x1flegnum%i\x1fusrmrk%s\x1fselect2\1f]]></Attr>\n", routeName, waypointp->shortname, legNum, waypointp->description);
+       gbfprintf(ofd, "\t\t\t<LegAttr><![CDATA[attr=grpnam%s\x1f]]></LegAttr>\n", routeName);
+       gbfprintf(ofd, "\t\t\t<NumberOfVertexs>1</NumberOfVertexs>\n");
+       gbfprintf(ofd, "\t\t\t<Latitude>%lf</Latitude>\n", waypointp->latitude);
+       gbfprintf(ofd, "\t\t\t<Longitude>%lf</Longitude>\n", waypointp->longitude);
 
-       fprintf(ofd, "\t\t</Object>\n");
+       gbfprintf(ofd, "\t\t</Object>\n");
 
        legNum++;
 }
@@ -331,14 +331,14 @@ hsa_ndv_waypt_pr(const waypoint *waypointp)
 static void
 hsa_ndv_write(void)
 {
-       fprintf(ofd, "<?xml version=\"1.0\"?>\n");
-       fprintf(ofd, "<Export>\n");
-       fprintf(ofd, "\t<Route>\n");
-       fprintf(ofd, "\t\t<Version>1.0000000</Version>\n");
-       fprintf(ofd, "\t\t<Name>ROUTENAME</Name>\n");                   /*TODO: used filename? */
-       fprintf(ofd, "\t\t<LastModified>0</LastModified>\n");
+       gbfprintf(ofd, "<?xml version=\"1.0\"?>\n");
+       gbfprintf(ofd, "<Export>\n");
+       gbfprintf(ofd, "\t<Route>\n");
+       gbfprintf(ofd, "\t\t<Version>1.0000000</Version>\n");
+       gbfprintf(ofd, "\t\t<Name>ROUTENAME</Name>\n");                 /*TODO: used filename? */
+       gbfprintf(ofd, "\t\t<LastModified>0</LastModified>\n");
        waypt_disp_all(hsa_ndv_waypt_pr);
-       fprintf(ofd, "\t</Route>\n");
+       gbfprintf(ofd, "\t</Route>\n");
 
 //later we'll import past tracks and chart objects?
 //     fprintf(ofd, "\t<Chartwork>\n");
@@ -347,7 +347,7 @@ hsa_ndv_write(void)
 //     fprintf(ofd, "\t</Chartwork>\n");
 
 
-       fprintf(ofd, "</Export>\n");
+       gbfprintf(ofd, "</Export>\n");
 }
 
 ff_vecs_t HsaEndeavourNavigator_vecs = {

diff --git a/ignrando.c b/ignrando.c
index 98b449bfac0b76e7e9b4ef8bb61a9ff818da4018..7a76b57bbe681d4c7f412131d04b070aea3c1440 100644 (file)
--- a/ignrando.c
+++ b/ignrando.c
@@ -1,8 +1,8 @@
 /* 
 
-       Support for IGN Rando track files, 
+       Support for IGN Rando track files.
        
-       Copyright (C) 2005 Olaf Klein, o.b.klein@gpsbabel.org
+       Copyright (C) 2005,2006 Olaf Klein, o.b.klein@gpsbabel.org
 
        This program is free software; you can redistribute it and/or modify
        it under the terms of the GNU General Public License as published by
@@ -33,7 +33,7 @@
 
 #define MYNAME "IGNRando"
 
-static FILE *fout;
+static gbfile *fout;
 
 static route_head *track;
 static waypoint *wpt;
@@ -189,50 +189,18 @@ ignr_read(void)
 
 /* write support */
 
-static void
-ignr_fprintf(FILE *f, const char *fmt, ...)
-{
-       char buff[256];
-       char *temp = buff;
-       va_list args;
-       int i;
-       
-       va_start(args, fmt);
-       
-       i = vsnprintf(buff, sizeof(buff), fmt, args);
-       if (i >= (int) sizeof(buff))
-       {
-               temp = xmalloc(i + 1);
-               i = vsnprintf(temp, i + 1, fmt, args);
-       }
-       if (i < 0)
-       {
-               fatal(MYNAME ": error in vsnprintf.\n");        
-       }
-       else if (i > 0)
-       {
-               char eol = temp[i - 1];
-               if (eol == '\n') i--;
-               fwrite(temp, 1, i, f);
-               if (eol == '\n') fprintf(f, "\r\n");
-       }
-       
-       if (temp != buff) xfree(temp);
-       va_end(args);
-}
-
 /* callbacks registered in ignr_vecs */
 
 static void 
 ignr_rw_init(const char *fname)
 {
-       fout = xfopen(fname, "wb", MYNAME);
+       fout = gbfopen(fname, "w", MYNAME);
 }
 
 static void 
 ignr_rw_deinit(void)
 {
-       fclose(fout);
+       gbfclose(fout);
 }
 
 static void
@@ -242,11 +210,11 @@ ignr_write_track_hdr(const route_head *track)
 
        if (track_num != track_index) return;
        
-       ignr_fprintf(fout, "\t<INFORMATIONS>\n");
-       ignr_fprintf(fout, "\t\t<NB_ETAPES>%d</NB_ETAPES>\n", track->rte_waypt_ct);
+       gbfprintf(fout, "\t<INFORMATIONS>\n");
+       gbfprintf(fout, "\t\t<NB_ETAPES>%d</NB_ETAPES>\n", track->rte_waypt_ct);
        if (track->rte_desc != NULL)
-               ignr_fprintf(fout, "\t\t<DESCRIPTION>%s</DESCRIPTION>\n", track->rte_desc);
-       ignr_fprintf(fout, "\t</INFORMATIONS>\n");
+               gbfprintf(fout, "\t\t<DESCRIPTION>%s</DESCRIPTION>\n", track->rte_desc);
+       gbfprintf(fout, "\t</INFORMATIONS>\n");
 }
 
 static void
@@ -259,11 +227,11 @@ ignr_write_waypt(const waypoint *wpt)
 {
        if (track_num != track_index) return;
 
-       ignr_fprintf(fout, "\t<ETAPE>\n");
-       ignr_fprintf(fout, "\t\t<POSITION>%3.6f,%3.6f</POSITION>\n", wpt->latitude, wpt->longitude);
+       gbfprintf(fout, "\t<ETAPE>\n");
+       gbfprintf(fout, "\t\t<POSITION>%3.6f,%3.6f</POSITION>\n", wpt->latitude, wpt->longitude);
        if (wpt->altitude != unknown_alt)
-               ignr_fprintf(fout, "\t\t<ALTITUDE>%3.6f</ALTITUDE>\n", wpt->altitude);
-       ignr_fprintf(fout, "\t</ETAPE>\n");
+               gbfprintf(fout, "\t\t<ALTITUDE>%3.6f</ALTITUDE>\n", wpt->altitude);
+       gbfprintf(fout, "\t</ETAPE>\n");
 }
 
 static void 
@@ -287,20 +255,20 @@ ignr_write(void)
         now = current_time();
        tm = *localtime(&now);
        
-       ignr_fprintf(fout, "<?xml version=\"1.0\" encoding=\"windows-1252\"?>\n");
-       ignr_fprintf(fout, "<RANDONNEE>\n");
-       ignr_fprintf(fout, "\t<ENTETE>\n");
-       ignr_fprintf(fout, "\t\t<VERSION_XML>1.1</VERSION_XML>\n");
-       ignr_fprintf(fout, "\t\t<VERSION_BASE>IHA03AA</VERSION_BASE>\n");
+       gbfprintf(fout, "<?xml version=\"1.0\" encoding=\"windows-1252\"?>\n");
+       gbfprintf(fout, "<RANDONNEE>\n");
+       gbfprintf(fout, "\t<ENTETE>\n");
+       gbfprintf(fout, "\t\t<VERSION_XML>1.1</VERSION_XML>\n");
+       gbfprintf(fout, "\t\t<VERSION_BASE>IHA03AA</VERSION_BASE>\n");
        
        strftime(buff, sizeof(buff), "%d/%m/%Y", &tm);
-       ignr_fprintf(fout, "\t\t<DATE>%s</DATE>\n", buff);
+       gbfprintf(fout, "\t\t<DATE>%s</DATE>\n", buff);
        strftime(buff, sizeof(buff), "%H:%M:%S", &tm);
-       ignr_fprintf(fout, "\t\t<HEURE>%s</HEURE>\n", buff);
+       gbfprintf(fout, "\t\t<HEURE>%s</HEURE>\n", buff);
        
-       ignr_fprintf(fout, "\t</ENTETE>\n");
+       gbfprintf(fout, "\t</ENTETE>\n");
        track_disp_all(ignr_write_track_hdr, ignr_write_track_trl, ignr_write_waypt);
-       ignr_fprintf(fout, "</RANDONNEE>\n");
+       gbfprintf(fout, "</RANDONNEE>\n");
 }
 
 ff_vecs_t ignr_vecs = {

diff --git a/xmlgeneric.c b/xmlgeneric.c
index edd478f4cd7471aeea51b1c6f6ff48105d5953b0..d0c7b45924ce195e8ceac05c874dea532bd55872 100644 (file)
--- a/xmlgeneric.c
+++ b/xmlgeneric.c
@@ -39,7 +39,7 @@ static const char **xg_ignore_taglist;
 #define MYNAME "XML Reader"
 
 void
-write_xml_header(FILE *ofd)
+write_xml_header(gbfile *ofd)
 {
        char buff[128];
        cet_cs_vec_t *cs = cet_find_cs_by_name(CET_CHARSET_ASCII);
@@ -48,20 +48,20 @@ write_xml_header(FILE *ofd)
            snprintf(buff, sizeof(buff), " encoding=\"%s\"", global_opts.charset_name);
        else
            buff[0] = 0;
-       fprintf(ofd, "<?xml version=\"1.0\"%s?>\n", buff);
+       gbfprintf(ofd, "<?xml version=\"1.0\"%s?>\n", buff);
 }
 
 void
-write_xml_entity(FILE *ofd, const char *indent,
+write_xml_entity(gbfile *ofd, const char *indent,
                  const char *tag, const char *value)
 {
         char *tmp_ent = xml_entitize(value);
-        fprintf(ofd, "%s<%s>%s</%s>\n", indent, tag, tmp_ent, tag);
+        gbfprintf(ofd, "%s<%s>%s</%s>\n", indent, tag, tmp_ent, tag);
         xfree(tmp_ent);
 }
 
 void
-write_optional_xml_entity(FILE *ofd, const char *indent,
+write_optional_xml_entity(gbfile *ofd, const char *indent,
                           const char *tag, const char *value)
 {
         if (value && *value)
@@ -69,34 +69,34 @@ write_optional_xml_entity(FILE *ofd, const char *indent,
 }
 
 void
-write_xml_entity_begin0(FILE *ofd, const char *indent,
+write_xml_entity_begin0(gbfile *ofd, const char *indent,
                                                          const char *tag)
 {
-    fprintf(ofd, "%s<%s>\n", indent, tag);
+    gbfprintf(ofd, "%s<%s>\n", indent, tag);
 }
 
 void
-write_xml_entity_begin1(FILE *ofd, const char *indent,
+write_xml_entity_begin1(gbfile *ofd, const char *indent,
                                                          const char *tag, const char *attr,
                                                          const char *attrval)
 {
-    fprintf(ofd, "%s<%s %s=\"%s\">\n", indent, tag, attr, attrval);
+    gbfprintf(ofd, "%s<%s %s=\"%s\">\n", indent, tag, attr, attrval);
 }
 
 void
-write_xml_entity_begin2(FILE *ofd, const char *indent,
+write_xml_entity_begin2(gbfile *ofd, const char *indent,
                                                          const char *tag, const char *attr1,
                                                          const char *attrval1, const char *attr2,
                                                          const char *attrval2)
 {
-    fprintf(ofd, "%s<%s %s=\"%s\" %s=\"%s\">\n", indent, tag, attr1, attrval1, attr2, attrval2);
+    gbfprintf(ofd, "%s<%s %s=\"%s\" %s=\"%s\">\n", indent, tag, attr1, attrval1, attr2, attrval2);
 }
 
 void
-write_xml_entity_end(FILE *ofd, const char *indent,
+write_xml_entity_end(gbfile *ofd, const char *indent,
                                         const char *tag)
 {
-    fprintf(ofd, "%s</%s>\n", indent, tag);
+    gbfprintf(ofd, "%s</%s>\n", indent, tag);
 }
 
 void
@@ -124,12 +124,12 @@ xml_fill_in_time(char *time_string, const time_t timep, int long_or_short)
 }
 
 void
-xml_write_time(FILE *ofd, const time_t timep, char *elname)
+xml_write_time(gbfile *ofd, const time_t timep, char *elname)
 {
        char time_string[64];
        xml_fill_in_time(time_string, timep, XML_LONG_TIME);
        if (time_string[0]) {
-               fprintf(ofd, "<%s>%s</%s>\n",
+               gbfprintf(ofd, "<%s>%s</%s>\n",
                        elname,
                        time_string,
                        elname

diff --git a/xmlgeneric.h b/xmlgeneric.h
index ecfa68dd7695f0161d364ef610e7955e7fca84c9..c575b644925b11fbc05750a5d38071e95fc0006b 100644 (file)
--- a/xmlgeneric.h
+++ b/xmlgeneric.h
@@ -36,23 +36,23 @@ typedef struct xg_tag_mapping {
 } xg_tag_mapping;
 
 
-void write_xml_entity(FILE *ofd, const char *indent,
+void write_xml_entity(gbfile *ofd, const char *indent,
                const char *tag, const char *value);
-void write_xml_entity_begin0(FILE *ofd, const char *indent,
+void write_xml_entity_begin0(gbfile *ofd, const char *indent,
                const char *tag);
-void write_xml_entity_begin1(FILE *ofd, const char *indent, const char *tag, 
+void write_xml_entity_begin1(gbfile *ofd, const char *indent, const char *tag, 
                const char *attr1, const char *attrval1);
-void write_xml_entity_begin2(FILE *ofd, const char *indent, const char *tag, 
+void write_xml_entity_begin2(gbfile *ofd, const char *indent, const char *tag, 
                const char *attr1, const char *attrval1, 
                const char *attr2, const char *attrval2);
-void write_xml_entity_end(FILE *ofd, const char *indent, const char *tag);
+void write_xml_entity_end(gbfile *ofd, const char *indent, const char *tag);
 
-void write_optional_xml_entity(FILE *ofd, const char *indent,
+void write_optional_xml_entity(gbfile *ofd, const char *indent,
                const char *tag, const char *value);
-void xml_write_time(FILE *ofd, const time_t timep, char *elname);
+void xml_write_time(gbfile *ofd, const time_t timep, char *elname);
 void xml_fill_in_time(char *time_string, const time_t timep, 
                int long_or_short);
-void write_xml_header(FILE *ofd);
+void write_xml_header(gbfile *ofd);
 void xml_ignore_tags(const char **taglist);
 
 void xml_init(const char *fname, xg_tag_mapping *tbl,const char *encoding);